From: Jim Blandy Date: Thu, 25 Mar 1993 04:39:49 +0000 (+0000) Subject: * x-win.el (x-defined-colors): Use x-color-defined-p instead of X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96693 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=847f5dab018c6b0014f96a19e3a01ad94bc67a6e;p=emacs.git * x-win.el (x-defined-colors): Use x-color-defined-p instead of x-defined-color. (x-handle-geometry): Use x-parse-geometry instead of x-geometry. --- diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index a088a265b29..2e518476294 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -147,8 +147,9 @@ ;; Handle the geometry option (defun x-handle-geometry (switch) - (setq initial-frame-alist (append initial-frame-alist - (x-geometry (car x-invocation-args))) + (setq initial-frame-alist + (append initial-frame-alist + (x-parse-geometry (car x-invocation-args))) x-invocation-args (cdr x-invocation-args))) (defvar x-display-name nil @@ -418,7 +419,7 @@ This returns ARGS with the arguments that have been processed removed." (while all-colors (setq this-color (car all-colors) all-colors (cdr all-colors)) - (and (x-defined-color this-color) + (and (x-color-defined-p this-color) (setq defined-colors (cons this-color defined-colors)))) defined-colors))